Fix entry in display-buffer--action-function-custom-type

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3e65ac2b77de33fe9ad127e6c0febb1b1dcb81ca..ba483bde4067713f90288234764ae8e9f0701a56 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-30  Martin Rudalics  <rudalics@gmx.at>
+
+       * window.el (display-buffer--action-function-custom-type): Fix
+       entry.
+
 2012-04-27  Alan Mackenzie  <acm@muc.de>
 
        * progmodes/cc-defs.el (c-version): Update to 5.32.3.

diff --git a/lisp/window.el b/lisp/window.el
index 7abe3fbfe7fc2e68724a710ecf4827a467e3e4c6..49f84960078b52fd86fb32e6dc5f703710cf3a22 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -4607,7 +4607,7 @@ The actual non-nil value of this variable will be copied to the
   '(choice :tag "Function"
           (const :tag "--" ignore) ; default for insertion
           (const display-buffer-reuse-window)
-          (const display-buffer-use-some-window)
+          (const display-buffer-pop-up-window)
           (const display-buffer-same-window)
           (const display-buffer-pop-up-frame)
           (const display-buffer-use-some-window)